matcher: Add a superset matcher

This matcher always matches only on some relvant things and ignores the
rest. This allows you to match only on name and class, but ignore state
and parents/siblings for example.

diff --git a/gtk/gtkcssmatcher.c b/gtk/gtkcssmatcher.c
index 5a25bfd8a46abd236c9fdceece09958f34ae4af4..7c09d0ca51f4fb8cc40559bcab0380b4e90ebd96 100644 (file)
--- a/gtk/gtkcssmatcher.c
+++ b/gtk/gtkcssmatcher.c
@@ -291,3 +291,128 @@ _gtk_css_matcher_any_init (GtkCssMatcher *matcher)
   matcher->klass = &GTK_CSS_MATCHER_ANY;
 }
 
+/* GTK_CSS_MATCHER_WIDGET_SUPERSET */
+
+static gboolean
+gtk_css_matcher_superset_get_parent (GtkCssMatcher       *matcher,
+                                     const GtkCssMatcher *child)
+{
+  _gtk_css_matcher_any_init (matcher);
+
+  return TRUE;
+}
+
+static gboolean
+gtk_css_matcher_superset_get_previous (GtkCssMatcher       *matcher,
+                                       const GtkCssMatcher *next)
+{
+  _gtk_css_matcher_any_init (matcher);
+
+  return TRUE;
+}
+
+static GtkStateFlags
+gtk_css_matcher_superset_get_state (const GtkCssMatcher *matcher)
+{
+  /* XXX: This gets tricky when we implement :not() */
+
+  if (matcher->superset.relevant & GTK_CSS_CHANGE_STATE)
+    return _gtk_css_matcher_get_state (matcher->superset.subset);
+  else
+    return GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED
+      | GTK_STATE_FLAG_INSENSITIVE | GTK_STATE_FLAG_INCONSISTENT
+      | GTK_STATE_FLAG_FOCUSED | GTK_STATE_FLAG_BACKDROP;
+}
+
+static gboolean
+gtk_css_matcher_superset_has_name (const GtkCssMatcher *matcher,
+                                   const char          *name)
+{
+  if (matcher->superset.relevant & GTK_CSS_CHANGE_NAME)
+    return _gtk_css_matcher_has_name (matcher->superset.subset, name);
+  else
+    return TRUE;
+}
+
+static gboolean
+gtk_css_matcher_superset_has_class (const GtkCssMatcher *matcher,
+                                    const char          *class_name)
+{
+  if (matcher->superset.relevant & GTK_CSS_CHANGE_CLASS)
+    return _gtk_css_matcher_has_class (matcher->superset.subset, class_name);
+  else
+    return TRUE;
+}
+
+static gboolean
+gtk_css_matcher_superset_has_id (const GtkCssMatcher *matcher,
+                                 const char          *id)
+{
+  if (matcher->superset.relevant & GTK_CSS_CHANGE_NAME)
+    return _gtk_css_matcher_has_id (matcher->superset.subset, id);
+  else
+    return TRUE;
+}
+
+static gboolean
+gtk_css_matcher_superset_has_regions (const GtkCssMatcher *matcher)
+{
+  if (matcher->superset.relevant & GTK_CSS_CHANGE_NAME)
+    return _gtk_css_matcher_has_regions (matcher->superset.subset);
+  else
+    return TRUE;
+}
+
+static gboolean
+gtk_css_matcher_superset_has_region (const GtkCssMatcher *matcher,
+                                     const char          *region,
+                                     GtkRegionFlags       flags)
+{
+  if (matcher->superset.relevant & GTK_CSS_CHANGE_NAME)
+    {
+      if (matcher->superset.relevant & GTK_CSS_CHANGE_POSITION)
+        return _gtk_css_matcher_has_region (matcher->superset.subset, region, flags);
+      else
+        return _gtk_css_matcher_has_region (matcher->superset.subset, region, 0);
+    }
+  else
+    return TRUE;
+}
+
+static gboolean
+gtk_css_matcher_superset_has_position (const GtkCssMatcher *matcher,
+                                       gboolean             forward,
+                                       int                  a,
+                                       int                  b)
+{
+  if (matcher->superset.relevant & GTK_CSS_CHANGE_POSITION)
+    return _gtk_css_matcher_has_position (matcher->superset.subset, forward, a, b);
+  else
+    return TRUE;
+}
+
+static const GtkCssMatcherClass GTK_CSS_MATCHER_SUPERSET = {
+  gtk_css_matcher_superset_get_parent,
+  gtk_css_matcher_superset_get_previous,
+  gtk_css_matcher_superset_get_state,
+  gtk_css_matcher_superset_has_name,
+  gtk_css_matcher_superset_has_class,
+  gtk_css_matcher_superset_has_id,
+  gtk_css_matcher_superset_has_regions,
+  gtk_css_matcher_superset_has_region,
+  gtk_css_matcher_superset_has_position,
+};
+
+void
+_gtk_css_matcher_superset_init (GtkCssMatcher       *matcher,
+                                const GtkCssMatcher *subset,
+                                GtkCssChange         relevant)
+{
+  g_return_if_fail (subset != NULL);
+  g_return_if_fail ((relevant & ~(GTK_CSS_CHANGE_CLASS | GTK_CSS_CHANGE_NAME | GTK_CSS_CHANGE_POSITION | GTK_CSS_CHANGE_STATE)) == 0);
+
+  matcher->superset.klass = &GTK_CSS_MATCHER_SUPERSET;
+  matcher->superset.subset = subset;
+  matcher->superset.relevant = relevant;
+}
+

diff --git a/gtk/gtkcssmatcherprivate.h b/gtk/gtkcssmatcherprivate.h
index 1d07218ffc8566aa497e942b35cefb2f850f77da..b562127eaf041baebf07b9c01e480ea75ee76b44 100644 (file)
--- a/gtk/gtkcssmatcherprivate.h
+++ b/gtk/gtkcssmatcherprivate.h
@@ -20,10 +20,12 @@
 
 #include <gtk/gtkenums.h>
 #include <gtk/gtktypes.h>
+#include "gtk/gtkcsstypesprivate.h"
 
 G_BEGIN_DECLS
 
 typedef union _GtkCssMatcher GtkCssMatcher;
+typedef struct _GtkCssMatcherSuperset GtkCssMatcherSuperset;
 typedef struct _GtkCssMatcherWidgetPath GtkCssMatcherWidgetPath;
 typedef struct _GtkCssMatcherClass GtkCssMatcherClass;
 
@@ -58,15 +60,26 @@ struct _GtkCssMatcherWidgetPath {
   guint                     sibling_index;
 };
 
+struct _GtkCssMatcherSuperset {
+  const GtkCssMatcherClass *klass;
+  const GtkCssMatcher      *subset;
+  GtkCssChange              relevant;
+};
+
 union _GtkCssMatcher {
   const GtkCssMatcherClass *klass;
   GtkCssMatcherWidgetPath   path;
+  GtkCssMatcherSuperset     superset;
 };
 
 void              _gtk_css_matcher_init           (GtkCssMatcher          *matcher,
                                                    const GtkWidgetPath    *path,
                                                    GtkStateFlags           state);
 void              _gtk_css_matcher_any_init       (GtkCssMatcher          *matcher);
+void              _gtk_css_matcher_superset_init  (GtkCssMatcher          *matcher,
+                                                   const GtkCssMatcher    *subset,
+                                                   GtkCssChange            relevant);
+
 
 static inline gboolean
 _gtk_css_matcher_get_parent (GtkCssMatcher       *matcher,